Return NULL instead of FALSE in g_return_val_if_fail in a

2006-03-31  Behdad Esfahbod  <behdad@gnome.org>

        * gtk/gtkfilesystem.c (gtk_file_system_get_bookmark_label):
        * gtk/gtklinkbutton.c (gtk_link_button_new_with_label): Return NULL
        instead of FALSE in g_return_val_if_fail in a pointer-returning
        function. (#336764, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 0ad2d243bff67004a30cf3d95b9faf95bb28a01b..d4d5ad86ac4da0ce5d7d44dfcb183ad7290d1fae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
+2006-03-31  Behdad Esfahbod  <behdad@gnome.org>
+
+       * gtk/gtkfilesystem.c (gtk_file_system_get_bookmark_label):
+       * gtk/gtklinkbutton.c (gtk_link_button_new_with_label): Return NULL
+       instead of FALSE in g_return_val_if_fail in a pointer-returning
+       function. (#336764, Morten Welinder)
+
 2006-04-01  Gora Mohanty  <gmohanty@cvs.gnome.org>
 
-        * configure.in: Added 'or' (Oriya) to ALL_LINGUAS.
+       * configure.in: Added 'or' (Oriya) to ALL_LINGUAS.
 
 2006-03-31  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0ad2d243bff67004a30cf3d95b9faf95bb28a01b..d4d5ad86ac4da0ce5d7d44dfcb183ad7290d1fae 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,13 @@
+2006-03-31  Behdad Esfahbod  <behdad@gnome.org>
+
+       * gtk/gtkfilesystem.c (gtk_file_system_get_bookmark_label):
+       * gtk/gtklinkbutton.c (gtk_link_button_new_with_label): Return NULL
+       instead of FALSE in g_return_val_if_fail in a pointer-returning
+       function. (#336764, Morten Welinder)
+
 2006-04-01  Gora Mohanty  <gmohanty@cvs.gnome.org>
 
-        * configure.in: Added 'or' (Oriya) to ALL_LINGUAS.
+       * configure.in: Added 'or' (Oriya) to ALL_LINGUAS.
 
 2006-03-31  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 60443905702d9ced68099af841465d763a4541ec..9158d6dba2a8eccbc17a270e1530067f3f5d6a63 100644 (file)
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -793,7 +793,7 @@ gtk_file_system_get_bookmark_label (GtkFileSystem     *file_system,
   GtkFileSystemIface *iface;
 
   g_return_val_if_fail (GTK_IS_FILE_SYSTEM (file_system), NULL);
-  g_return_val_if_fail (path != NULL, FALSE);
+  g_return_val_if_fail (path != NULL, NULL);
 
   iface = GTK_FILE_SYSTEM_GET_IFACE (file_system);
   if (iface->get_bookmark_label)

diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index a68ca3b26734e54ebaf3eb3fc5627ea3defa49b6..81b8b657d61a553db8b395edad1292cdd0aac09f 100644 (file)
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -563,7 +563,7 @@ gtk_link_button_new_with_label (const gchar *uri,
 {
   GtkWidget *retval;
   
-  g_return_val_if_fail (uri != NULL, FALSE);
+  g_return_val_if_fail (uri != NULL, NULL);
   
   if (!label)
     return gtk_link_button_new (uri);